Fix timeout decrement and comparisons
Ian Blenke
1 changed files with 3 additions and 3 deletions
+ 3
- 3
docker/scripts/init
@@ -62,8 +62,8 @@ EOF |
||
| 62 | 62 |
cat <<BOOTSTRAP > /tmp/bootstrap.sh |
| 63 | 63 |
#!/bin/bash -xe |
| 64 | 64 |
# start mysql server if ${DATABASE_HOST} is localhost
|
| 65 |
-if [ "${DATABASE_HOST}" == "localhost" ]; then
|
|
| 66 |
- if [ "${DATABASE_ADAPTER}" == "postgres" ]; then
|
|
| 65 |
+if [ "${DATABASE_HOST}" = "localhost" ]; then
|
|
| 66 |
+ if [ "${DATABASE_ADAPTER}" = "postgres" ]; then
|
|
| 67 | 67 |
echo "DATABASE_ADAPTER 'postgres' is not supported internally. Please provide DATABASE_HOST." |
| 68 | 68 |
exit 1 |
| 69 | 69 |
fi |
@@ -98,7 +98,7 @@ EOF |
||
| 98 | 98 |
timeout=120 |
| 99 | 99 |
while ! mysqladmin -uroot ${DATABASE_PASSWORD:+-p$DATABASE_PASSWORD} status >/dev/null 2>&1
|
| 100 | 100 |
do |
| 101 |
- timeout=$(expr $timeout - 1) |
|
| 101 |
+ (( timeout = timeout - 1 )) |
|
| 102 | 102 |
if [ $timeout -eq 0 ]; then |
| 103 | 103 |
echo "Failed to start mysql server" |
| 104 | 104 |
exit 1 |